From 6088c5cb6eaef9a6f5c3c48efc2f56489511c129 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Wed, 14 Jul 2004 19:37:53 +0000 Subject: [PATCH] bitkeeper revision 1.1092 (40f58b91EPi_jnua2Uu_mG3PqibC8w) more parts of: - Include Linux 2.6 in top-level Makefile - Enable module support in 2.6 --- linux-2.6.7-xen-sparse/arch/xen/Makefile | 8 ++++++++ linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU | 7 ++++++- linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile | 5 +++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/linux-2.6.7-xen-sparse/arch/xen/Makefile b/linux-2.6.7-xen-sparse/arch/xen/Makefile index e0b8b37abe..f7734e040b 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile @@ -52,12 +52,20 @@ all: vmlinuz vmlinuz: vmlinux $(Q)$(MAKE) $(build)=arch/xen/boot vmlinuz +INSTALL_NAME ?= $(KERNELRELEASE) +install: vmlinuz + mkdir -p $(INSTALL_PATH)/boot + install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) + install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-$(INSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX) + archclean: @if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi; @rm -f arch/xen/arch include/.asm-ignore include/asm-xen/asm define archhelp echo '* vmlinuz - Compressed kernel image' + echo ' install - Install kernel image and config file' endef ifneq ($(XENARCH),) diff --git a/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU b/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU index bbc2c16697..4a93fa6a3c 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU @@ -37,7 +37,12 @@ CONFIG_IOSCHED_CFQ=y # # Loadable module support # -# CONFIG_MODULES is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y CONFIG_X86=y # CONFIG_X86_64 is not set diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile index e844047cfb..816fcaa096 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile @@ -8,11 +8,12 @@ CFLAGS += -Iarch/$(XENARCH)/kernel extra-y := head.o init_task.o vmlinux.lds.s -obj-y := traps.o irq.o ldt.o setup.o entry.o time.o process.o signal.o +obj-y := traps.o irq.o ldt.o setup.o entry.o time.o process.o signal.o \ + i386_ksyms.o c-obj-y := semaphore.o vm86.o \ ptrace.o ioport.o sys_i386.o \ - pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ + pci-dma.o i387.o dmi_scan.o bootflag.o \ doublefault.o s-obj-y := -- 2.30.2